Merge "Allow WindowOrganizerController to handle DisplayAreas" into rvc-dev am: 2bac1596 am: 25402d17 Change-Id: Ib7a9f3ecb700ba31902bd2458f921b8c5ea3bd64