Merge "Make notification match the mocks." into rvc-dev