Merge "Fix notificationinfo test breakage" into pi-dev