Merge "Don't reset BG restriction cache on toggling battery saver on/off"