Merge "Fix UI jank issue"