Merge "Fix wrong orientation change when a video call ends"