Merge "Decorated custom views now behave better if no custom view is set" into nyc-dev