Merge "Adding workaround for issue where icon labels on workspace were loaded differently than those in AllApps. (Bug 5250760)"