Merge "Ensure notification visibility on stopForeground(false)" into sc-dev