am 5818811e: Merge "Improve content notifications" into ics-mr0

* commit '5818811e40d0e5805fcf68ce3117b258b2b4591d':
  Improve content notifications