Merge "Ensure ActivityStack's cached resumed activity is updated." into pi-dev