Merge "Stop inflate on overflow and null check views" into rvc-dev am: 39ea2f1d am: 59907cf8 am: d4b7be24 Change-Id: Ife04390fbc9cc4fdcae0976b2c6f2f2a50272a14