Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev