Merge "Fix 6504124: Disable assist when ACTION_ASSIST is not available" into jb-dev