Fix deadlock issue caused by overeager updates
Fix deadlock issue caused by overeager updates

visoft/shuttle,square/shuttle,visoft/shuttle,visoft/shuttle,square/shuttle,visoft/shuttle,square/shuttle,square/shuttle