Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev