Merge "[SurfaceFlinger] Remove unused functions." into qt-dev