Merge "shell tests: add EnsureDeviceSettingsRule" into main