Merge "Allow WindowOrganizerController to handle DisplayAreas" into rvc-dev