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