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

Change-Id: I9860424ffa54807eccc6ef7ab4dbba99ed18d46a