Merge "sdm: Enable Hybrid composition" into dev-2.0