Merge "Support trimmed images in BootAnimation" into nyc-mr1-dev