Merge "Merge "Don't constraint view sizes as much" into rvc-dev am: 43c30814 am: 98121537" into rvc-d1-dev-plus-aosp