Merge "Support AVD animation falling back on UI thread" into nyc-mr1-dev