Merge "Stop inflate on overflow and null check views" into rvc-dev am: 39ea2f1d51 am: 59907cf883

Change-Id: I5ac42a2c46ce7452bcc181e38c5afe73ff81b80f