Merge "Support wireless charge state" into sc-dev