Merge "Fix IllegalArgumentException from Surface.release()"