Merge "Disable gesture control to switch apps from nav bar"