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

Change-Id: I6075c26cb0cd73de62f1607712c720e2d2a6248c