Merge "Define separate horizontal margins for Dual Shade." into main