Merge "Prevent duplicate call to update movement bounds on rotation"