Merge "Do not set activity's task before clearing in some scenarios." into pi-dev am: 540f747861
am: e88e558484

Change-Id: I8c81d2cbbecba64829096457303f361d4aa54698