Merge "Overlay property instead of style" into sc-dev