Merge "sdm: Dont set custom_mixer_resolution on error"