Merge "Avoid NPE in animation scheduling" into mnc-ub-dev