Merge "Fixing AVD animation with startOffset" into lmp-dev