Merge "SF: Call makeCurrent after presenting each display" am: 7bb8779a79 am: 5079756e8e am: 53df8fac8b
am: 3d69648490

Change-Id: Idba176720c4508e0b678a0a38475815cceb66293