Merge "Change mLayersWithQueuedFrames to be an unordered_set"