Merge "New strings for the gesture navigation settings page"