Merge "Fix NPE finding target activity after recents animation controller crash" into pi-dev am: ebcfc4bb79
am: 4790ae379d

Change-Id: I666af287a2bd055ff7f92f39067b1212b1656ed5