Merge "Avoid NPE around mReusedTask of ActivityStarter"