also accept CF_DIB (cherry picked from commit b7d59ee3) Change-Id: Iaafdeab981d6621e6696a642c68e29392af3e200