Merge "Use transition for desktop-mode switch when enabled" into tm-qpr-dev