Merge "Separate notifications from saving in background"