Merge pull request #11084 from rvdveen/lipo-continue-v2-shortmenu