Merge "MessagingImageMessage: Don't crash if measured after recycle" into tm-dev