Merge "Reduce RM createResources lock contention"