Merge changes I3e542532,Id8f2147f into pi-dev

* changes:
  Update notification blocking documentation.
  Wait before computing contact affinity