Merge "No-op clean up on UserSettings to make it more readable"