Merge "Protect shared element transitions from removed views." into oc-dev