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