Merge "Remove battery usage preference in app info page" into pi-dev