Merge "Fix dequeus outside of frame drawing" into oc-dev am: 944b0c73a4
am: 55302e2f4e

Change-Id: Ie4e36cf857fae21261108f2913c10618b8b98d9c