Merge "sde: Move locking to each display interface implementation"