Merge "Fix issue #109746350: startWatchingMode fails on P" into pi-dev