Merge "Fix the notification issue shown on startForeground"