Merge "Handle padding in wrap content" into mnc-ub-dev