Merge "Fix endTransition index out of bounds exception." into mnc-dev