Merge "Fix the icon size in app lists." into cm-11.0
(cherry picked from commit a0e531483dc0b7787acc2e8685134c95633b61b1)