Merge "Make photo loader low-memory device friendly" into ics-mr1