Simplify the "Running" notification text.
Merge branch 'master' into Lollipop