e0e5460066
This reverts commit 67c807a1fe.
Reason for revert: <Setting the SplitSelectStateController to null causes NPE in launcher>
Fix: 342553715
Bug: 332339792
Change-Id: I10433e468948c4ba826e79baa06925fdf7dfbe5d