Merge "Skip test if notification policy is not supported" into pi-dev