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

Change-Id: Ie4bf34f84a09e3147edba6ad099338fa82adc5ca