Merge "Add ability to rotate screen in AoD."