Merge "Make Apps Icons size consistent in Battery Stats"