[automerger] Handle null background or foreground when dragging adaptive icons am: 746c6c36b6

Change-Id: I3e254a7109e114072cf003ef5c2a4798604d1d1f