Merge "GLES2Dbg: add more state tracking and snapshot of state per GL call"