Merge "Add navigation mode to Settings.Secure" into qt-dev
am: eada1380b1

Change-Id: I312389a5955408b1794070f3168006d1c4f68131