Merge "Reset display settings applied via [DeviceEmulationRule]" into main