Merge "Revert "Allow delay of showing/hiding shared element when transferring.""