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

Change-Id: I61520a7bbab49fa5a4e9d66b78e7cd30ed116919