Merge "Clear static icon and label cache if ui mode is changed" into sc-dev