am 12da2c5e: Merge "Fix 6665117: ACTION_ASSIST visual improvements" into jb-dev

* commit '12da2c5eeeadd6c23da5d3003d0da3b6b73d5052':
  Fix 6665117: ACTION_ASSIST visual improvements