Merge "Skip drawing snapshot if we can't create the buffer." into oc-mr1-dev