Merge "Handle orientation changes more systematically. Bug: 4981385"