Merge "Don't full-data back up apps in foreground-equivalent state"