Use a frame wrapper for all highlights on MWBlockImageNode

This prevents the highlight for a centred image being full width.

Change-Id: I4d5a46766276e36f5720f330a5a856fe2906cd72
Merge "Use a frame wrapper for all highlights on MWBlockImageNode"