Merge "Fix 6414061: Add new ACTION_ASSIST intent." into jb-dev