Merge "Avoid starving RT anims" am: f77c220aa9 am: 7269372d5f am: 91d1bbce59
am: 39d001dff8  -s ours

Change-Id: I5b2f666a574865239dce83176a658174d0f98842