Merge "Staggered transition support for VerticalGrid" into mnc-ub-dev