-Really fix locking structure in ConcurrentFileState
-Fix AndroidStateFactory for new constructors
-Some more getContext->getState migrations