Merge "Don't constraint view sizes as much" into rvc-dev am: 43c30814 am: 98121537 am: 17a7890e Change-Id: I805fa3b384c0210e51139a3799d7270719cdf5a2