Merge "user: Avoid page_touched update in User::saveSettings"