Merge "Clear notifications properly on ACTION_USER_STOPPED." into jb-mr1-dev