Merge "Skip creating config context if it is the same as current" into sc-dev