Clean up flow-menu code, and redo flow-menu trigger in board-navigation

Change-Id: I8f5d65519fd4f56c72fdebe130d5939db3eb8cd3