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

Change-Id: Ida4807ded086a070e2e905f03d298ffd4c6ab98b