Merge "Merge "Protect shared element transitions from removed views." into oc-dev am: 70c1e51b am: 817d37c1"