Merge "Fix bug #16951566 Switchbar color needs to change to ff37474f" into lmp-dev