Merge "Avoid applying window config from updating persistent config" into sc-v2-dev