Merge "[automerger skipped] Merge "Allow shell to control transition animations" into udc-dev am: dca0a91a93 am: b18bd7f527 -s ours" into main