Merge "Set colorBackgroundFloating in ThemeOverlays" into nyc-mr1-dev