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