Merge "Fix NPE in overridePlayingAppAnimations" into nyc-mr1-dev