am b25c4e64: am 7795faac: am 4351111b: Merge "Fix jank when clicking on HUN" into mnc-dr-dev

* commit 'b25c4e64a61f78eef1efeaf96b02548a422f6d90':
  Fix jank when clicking on HUN