Merge "Avoid NPE in animation scheduling" into mnc-ub-dev
am: 82dc87fab2

* commit '82dc87fab23a590a94b5e63bd11ddfa6234f8695':
  Avoid NPE in animation scheduling