Merge "Merge \"Avoid throwing when 0 size layer requested\" into nyc-dev am: 807989facd" into nyc-mr1-dev