Merge "Refactors the System Navigation settings page" into qt-dev