Fix: 280864229 Test: manually rotate the screen Test: unit test Change-Id: I950ebae1c371ce05dd17710788eda3dc8bdfd2ca