Merge "Settings provider needs to send notifications as itself" into jb-mr1-dev