Fix listeners not getting called when AVD falls back on UI thread am: 853b23d1fa am: 79846f859c
am: a0daf61dd0

Change-Id: I90467d3501877b8f398be929084b6ae5f65360cf