Stop using old AndroidStateFactory, revert back to