Merge "sf: Fix issue with makeCurrent when multiple display present" into pie-gsi