Merge "Fix incomplete consolidation of kill-all-background"