Merge "Stop inflate on overflow and null check views" into rvc-dev