Merge "Fix 3-button Navigation Switch Access Long press" into main