Merge "Fix NPE in overridePlayingAppAnimations" into nyc-mr1-dev
am: 26df2bf4f8

Change-Id: I480d812cf295581f713e3712e21a107b4ce7ef33