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

Change-Id: I0a3ed75015265697c67d354a3e1b4536466e576a