Merge "Use proper icon size for default app prefs." into pi-dev am: 968dcaf41a
am: d45b7cbe40

Change-Id: I0f77ebaeb861fd4a15ec31abb1d6728b5dde1788