Merge "Immediately report drawing" into oc-dev