Merge "Increase character limit on PSS toggle translation" into main