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

Change-Id: Ib2144c43247af76a7a852d8368e5d6ee01164c38