convert navigation popup menu to action menu
Merge branch 'release'