Merge "Use applyAsyncUnsafe() instead of apply() to apply a transaction" into main