Merge "Add support for native image lazy loading"