Merge branch 'master' of github.com:UnityTech/UIWidgets into dev

# Conflicts:
#	Runtime/ui/painting/picture.cs

Author: zhuxingwei

Runtime/ui/painting/picture.cs

@@ -131,8 +131,8 @@ public void addDrawCmd(DrawCmd drawCmd) {
                     //check for underflow
                     if (this._states.Count > 1) {
                         this.restore();
-                        this._stateUpdateIndices.Add(this._drawCmds.Count - 1);
                     }
+                    this._stateUpdateIndices.Add(this._drawCmds.Count - 1);
                     break;
                 }