Merge "Force config update when twoline is toggled." into main