Merge "Improve content notifications" into ics-mr0