Merge "Refactor OperationType into its own proto." into qt-dev