Merge "Skip drawing snapshot if we can't create the buffer." into oc-mr1-dev am: 44e1d4eb3c
am: c94756d4a9

Change-Id: I5c022dce41fa31b59c086ace5bc527400a6f9ea3