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

Change-Id: Ida2f6dbe194a91fc63c21c0e4922ff055c6b5c61