Merge "Fix foreground service evaluation"