Merge "Doc update: CCS and notifications" into jb-mr1.1-docs