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

Change-Id: Ib42f50004cd224c9c1e87e62613a260cc0814394