7c8f44ae
36c2aa4a
* commit '7c8f44ae529ce32356d83e92c26d9ba62be3298c': Surface:lockHardwareCanvas DO NOT MERGE