Merge "Fix for Surface#lockHardwareCanvas lockups"