Merge "Merge "Fix launch single task case if it under split roots" into tm-qpr-dev am: 09c1e200" into tm-qpr-dev-plus-aosp