Merge "Add face tanning effect to gallery" into ics-mr1