Merge "Show app battery usage in correct user" into oc-dev