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

Change-Id: I2744f94b7a4e25bba5726e1d6b097dbc19040789