Merge "Fix slow callbacks in getWithSetCallback() using lockTSE"