Merge "Added compatibility support for decorated custom views" into nyc-mr1-dev