Merge "Merge "Fix shared transitions in screenshot shelf UI" into 24D1-dev am: 256196a191" into main