Merge "Added config system navigation keys." into nyc-mr1-dev