agontuk fixed "switch state conflicts"

Fix switch state conflicts
Taken from http://review.cyanogenmod.org/#/c/53657/