Merge "sdm: Avoid Connector and CRTC settings"