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

Change-Id: Ibd68e64eef362e02ad2764024f8fbed99c59afd3