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

Change-Id: I8f8a70a35f9b6ea75ae627af8235a0fe65802551