Merge "Refine the BatteryUsageStats close() method invoke timing" into tm-dev