Merge "Ensure PipTransitionController initializes in order" into tm-qpr-dev