Merge "[SurfaceFlinger] Make sure switch the protected state of buffers." into qt-dev