DOCX export: try harder to detect in-background shapes

Change-Id: If7a4a5b9aad564d026173b942fd0b4a2fb52e157