Merge "Fix listeners not getting called when AVD falls back on UI thread" into nyc-mr1-dev