Merge "Fix issue #25727069: Top sleeping activity overrides foreground service"