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

Change-Id: Ic967ff829ae73405b10d5d0e5a9bd51ea7a7428b