Merge "Refine NFC charging APIs" into main