Merge "Merge "Change battery icon to the side of bt icon" into oc-mr1-dev am: a57aea0d61 am: d5d9766793"