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

* commit '7795faace682aee863d836da91364b2ea5632c8f':
  Fix jank when clicking on HUN