Merge "Don't override bounds when reparenting" into rvc-dev am: 1fffbc69fb

Change-Id: Ia84fd15e0217060aada4ce7f3a9b42cd4bffbc8f