Merge "Refactor image loading."