Merge "Listen to folding state change for SplitController" into tm-qpr-dev