Merge "msm: gdsc: Replace 'retain-logic' property with 'skip-logic-collapse'"