Merge "Stop inflate on overflow and null check views" into rvc-dev am: 39ea2f1d am: 59907cf8 am: efd728cc am: 4363a7c4 Change-Id: Iec45b47d720386936431b7e5f8bd94cd1a9b3523