Merge "Reduce unnecessary config propagation of default display" into sc-dev