Merge "Fix color resolution on status bar"