Merge "HWUI: reset buffer state after MakeCurrent"