Merge "Fix issue #30647973: stopForeground() doesn't remove notification" into nyc-mr1-dev