Merge "Annotate NSM heavy methods with @WorkerThread"