Merge "Disable quickswitch for desktop windowing" into tm-qpr-dev