Merge "Make RootTaskDisplayAreaOrganizer optional." into sc-dev