Merge "Avoid NPE around mReusedTask of ActivityStarter" am: f741f88284 am: e79cb5c81d am: 77fc19fa8e
am: 1a1b16f300

Change-Id: Id3e9355cf77c3003b16797bcb5683908fa80d983