* commit 'a829e16681903e6a41901145195f88bf9d952f88': Handle orientation changes more systematically. Bug: 4981385