Merge "Fixed bug preventing shared elements from transitioning." into mnc-dev