Merge "Fix transition animations for launch-from-staged operation" into tm-qpr-dev