Merge "Change battery icon to the side of bt icon" into oc-mr1-dev