Merge "Fix inflating content views after removal" into rvc-dev am: 76807053 am: 14b897f9 am: 3a617181 Change-Id: I4656548eeaf2e77c60b7b52a1b519966dc700002