Merge "Merge "Do not schedule transition in onTaskVanished" into rvc-dev am: 1b27b75c am: 8835f0ed" into rvc-d1-dev-plus-aosp