Merge "API: Avoid unstubbing User for language pref when not needed"