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

Change-Id: I6aae4b4286475324ae4d316bc249fdf6c38fa631