Merge "Implement 3-btn-nav fixed rotation" into main