Merge "Fix nav keys being tiny on sw600dp devices"
am: a20239bf71

Change-Id: I30fbb071d290ff8477560f25216dd1ea04c789a6