Merge "[Settings] backport missing CL"