Merge "Add a flag to hide / unhide the PS settings" into main