Merge "Fix regressions with DecoratedCustomViewStyle" into sc-dev