Merge "WinScope: Modify instead of replacing proto objects"