Merge "Added WindowConfigurationProto and friends"