Merge "Avoid NPE around mReusedTask of ActivityStarter" am: f741f882 am: e79cb5c8 am: 77fc19fa am: 1a1b16f3 Change-Id: Id3e9355cf77c3003b16797bcb5683908fa80d983