Merge "Fix inconsistent icon size in app list."