Merge "Fix bug in the new notification sample." into ics-mr1