Merge "Stop inflate on overflow and null check views" into rvc-dev am: 39ea2f1d am: 31db155b am: 2206ae5f Change-Id: I133b62bca452ed462048a16e7dd1d4cc64d1fa5e