Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2