image sync: unification & simplification (some changes are rolled back)
Merge branch 'master' into ice-cream-sandwich