Merge "Merge "Always bring desktop tasks to front" into tm-qpr-dev am: 705dfd7c5e" into tm-qpr-dev-plus-aosp