Merge "WM: Refactor DisplayContent.getOrientation in preparation for DisplayArea (2/n)"