Merge "Clean up language in forced foreground service notifications." into jb-mr2-dev