Merge "Add Dimmer to RootDisplayArea" into sc-dev