Merge "Merge "Fix inflating content views after removal" into rvc-dev am: 76807053 am: 14b897f9 am: aef23be0" into rvc-qpr-dev-plus-aosp