Merge "Revert "Add a new tip type for wireless charging."" into main