Merge "Keep initial override configuration from display settings"