Separate notification handling from the central service

Change-Id: Iee0be50dfa3c56b70279580b7af243842df96d74