Merge "Use a different width for nav icons in sw600dp-port." into ics-scoop