Merge "Add fallback handling for gesture nav mode switch and launcher destroyed mid-gesture" into main