Fix bug of toggling mode in preferences screen doesn't behave correctly
Merge remote-tracking branch 'origin' into feature/modmaven-integration