Merge "add wireless charger support" into jb-mr1-dev