Merge "Add POST_NOTIFICATION to Watch role" into main