Merge "SurfaceFlinger: fix Sf/App offsets provided in getDisplayConfigs()" into qt-dev