Merge "Apply transitionGroup=true for static shadow" into mnc-ub-dev