Merge "display wireless charging status" into jb-mr1-dev