Merge "Fix ActionProviders that have submenus" into jb-dev