Merge "Update checkOnHandlerThread()" into main