Merge "SF/HWC2: Reorder makeCurrent to avoid deadlock" into nyc-dev