Merge "Moving a recently added trim() call in SwitchHandler after Null check."