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

Change-Id: I4ac8c497a9084024f69ef332f35f43bfa9316f6a