Merge "Copy over the wrapped drawable's bounds in wrap()" into mnc-ub-dev