Merge "Fixes changing the font scale of a background user should not affect UI"