Merge "Fix dequeus outside of frame drawing" into oc-dev