Merge "Refactor SplitSelectStateController to add testing" into tm-qpr-dev