Merge "Added support for RootTaskDisplayAreaOrganizer"