Merge "sde: Fix for external displays"