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

Change-Id: Iaf08c6aaf4377a34bf7b9c54a6fcc128cb80516e