Merge "Overview - add the ability to color scrim task views." into sc-dev