[Bug 1215185] New: Conflict: bitmap <-> Mesa-demo