Merge "Return error code if setting scaling mode fails"