Merge "Update TaskStackChangedListenerTest to not depend on ActivityView" into sc-dev