Merge "Fill the fade-in ImageView with its content for the cross fade animation" into tm-qpr-dev