Merge "Prevent possible NPE in TextureView"