Merge "Fixed a bug with decorated custom views" into oc-mr1-dev