Merge "Update Winscope with Windowmanagerservice.proto changes"