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

Change-Id: I1b58fbbfd5e6d5434057471621b3006495655e8f