Merge "Index the gesture options in System Navigation Settings page" into tm-dev