Merge "Allows for system navigation settings to be added dynamically." into main