Merge "charger: fix charger display stuck"