Revert "CDMA: Data connection bug fixes (3/4)"

This reverts commit e6c3cdb3e29bea4f43b0a06eee464bec426534e6.
Move ScreenState Toggle into advance Menu