Merge "Fix image + text layout; add  transition animation" into tm-qpr-dev