Merge "Fixing support for shared element transitions from a window"