StateSync: moved from augmenting dropOn and remove to onOwnerChanged, compressing the code and solving the shadow issue