Merge "Reduce RM createResources lock contention" into rvc-qpr-dev