Merge "Consistent color between status bar and app bar" into sc-dev