Merge "Prevent UI jank"