Merge "Fixes an issue with decorated custom view styles"