Merge "Adding test to make sure the icons seen when unfolded are the same when folded" into tm-qpr-dev