Merge "Floating menu repositions on navigation mode change" into main