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

Change-Id: I3ebdf0ad481dcf9e6ec2d12151d591a24c40458a