Merge "Add a UI Context for RootTaskDisplayAreaOrganizer"