Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  IndexEventHandler: Split delete change event in its own task
  Fix delete change event propagation

Change-Id: I0eae7d1e7d564be06c9b0b470d05ebf51dcb0e14