Merge "Track wireless charger detector timeout explicitly." into klp-dev