Merge "Avoid UI freezing when reading battery capacity/status"