Merge "SF: Call makeCurrent after presenting each display"