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