Also set the queue types map when rebuilding the ready queue map

Change-Id: I0686859541661a22131c387d8fac6dc7b074c18c
Merge "Also set the queue types map when rebuilding the ready queue map"