Merge "Fix nav keys being tiny on sw600dp devices" am: a20239bf71 am: 38cbc885d1
am: 0b922f2dd8

Change-Id: Idae1cdbac391e00e4e2f623017b343ec9de9cb44