Merge "Refactor PrintSettings (2/n)" into main