Merge "Limit shared element transition to shared elements and children." into mnc-dev