Merge "Prevent NPE in TextureView.getBitmap()" into jb-dev