(fix): refactor !292 (diffs) to use observables vs promises so we don't have to move changeDetection outside of scope

Is this a bug? Make sure to use the Bug template above and be as detailed in your report as possible.