Respect context death on bitmap delivery as well.

Change-Id: Ia0b2ad8cc91ce631e73296b7956ae2df7d4e4445