Merge "Don't offset the position of the thumbnail in change transitions"