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

Change-Id: I5ceec1775ba3740ce781c3f6545cbb0ded5b5c45