Merge "Do not allow printing until preview is updated" into oc-dev