Merge "Avoid NPE around mReusedTask of ActivityStarter" am: f741f88284
am: e79cb5c81d

Change-Id: I45c03d29bec22b59decb7c95bc1464dd83094c90