Merge "fix SurfaceView visibility state changes" into jb-dev