Merge "Fix jank when clicking on HUN" into mnc-dr-dev