Merge "Avoid starving RT anims" am: f77c220aa9
am: 7269372d5f

Change-Id: Ife1e7ea95055d8179b4a622dc4dabce382575b5b