Merge "Fix issue #8401553: It's possible to startForeground()..." into jb-mr2-dev