Merge "Set gravity to end if we begin clipping subviews." into udc-dev