Merge "Ensure attributes for using Toolbar are in Settings theme despite OEM overlays." into sc-dev