Merge "Code cleaning for Printing Settings"