Merge "Remove flushShadowQueue"