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

Change-Id: I8d3dc9a491fcda92470435ebb433114b5d2ec335