Merge "Update strings for System Navigation settings page" into qt-dev
am: 485b3ad655

Change-Id: I9a6135103076c4ab3cdc815332493f776251fe09