Merge "[CDM] Add POST_NOTIFICATION to the Watch role" into main