Merge "batterymeter -> just meter." into oc-dev