Merge "HWUI: reset buffer state only for ES3 context"