Merge "Allow shell to control transition animations" into main