Merge "Get a valid stack for reparenting activities when task reset"