Merge "Reduce jank in User Settings"