Merge "Make tests wait correctly for Drawing to complete." into marshmallow-cts-dev