Merge "Adjust SurfaceView visibility on parent change" into qt-dev