Merge "Fix issues with getHistoricalOps() results overflowing Binder connection." into sc-dev