Merge "Avoid NPE around mReusedTask of ActivityStarter" into nyc-mr2-dev am: 53db761efb
am: cfe760531a

Change-Id: If35c341025e858939eef8424047d2595edfaac44