Merge "Rehide status bar signal problem colors on user builds."