Merge "Don't show Screen as Apps in advanced battery page" into oc-dev