Merge "Fix issue where status bar would have wrong colors"