Merge "Merge "Fix the notification issue shown on startForeground" am: ea86140ba4 am: 3b498d1c56 am: fd0239aa3f am: d5bf76fec0"