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