Merge "Fix callback issue for AVD on UI thread" into nyc-dev