Updated to 2.5.5, and the charging looks to be normal. But it cannot be concluded now. Because after SW update, there is a phone restart. Usually, the problem would not be visible on first charging after a phone restart. So need to wait and see if the problem is fully resolved in this update after few charging attempts. Lets hope for best 🙂 (mine is official nothing 45W charger)