Merge "Update view colors on onOverlayChanged()" into sc-dev