Merge "Do not update AppStandbyController on foreground service events"