Merge "Adds per-user APIs required by the Settings app"