Merge "Fix inflating content views after removal" into rvc-dev am: 76807053 am: 14b897f9 am: aef23be0 Change-Id: I271e63dbae269d558e4c9bb01ffefd6dcb83873e