Merge "Make DecoratedCustomViewStyle notifications consistent."