Merge "Refactor 3-btn-nav with flipv2" into main