Merge "SF: Call makeCurrent after presenting each display"
am: 7bb8779a79

Change-Id: If22c0369b968a72dcbac8b97061f5555c18e8432