Merge "Add test for setSettingsLocked" into main