Merge "Fix nav keys being tiny on sw600dp devices"