Merge "Only create DesktopModeController when flag is on" into tm-qpr-dev