Merge "Added read-only checks around User::saveSettings where they belong"