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

* commit '4351111bbb8b64ff8a89be549c0a503d487b1a78':
  Fix jank when clicking on HUN