Merge "Clear out battery stats for removed user more quickly"