Merge "Improve subpixel rendering of battery icon on all densities" into lmp-dev