Merge "Speeds up some Preference tests and fixes issues with gesture nav" into qt-dev