Merge "Basic documentation for custom drawables" into nyc-dev