Merge "Fix DecoratedCustomViewStyle"