Merge "Fix color of status bar"