Merge "Merge "Fix the notification issue shown on startForeground" am: ea86140b am: 3b498d1c am: fd0239aa am: d5bf76fe"