Merge "Developer settings: Disable wifi scan throttling" into qt-dev