Merge "Fix bug #16660819 Switchbar text should be white not grey" into lmp-dev