Merge "[incremental/pm] set health listener on commit and on reboot"