Merge "Introduce DisplayArea organizer" into rvc-dev