Merge "Make sure view is laid out before calling createBitmap"