Merge "Fix side channel leakage from the api of overrideLabelAndIcon" into sc-dev