Merge "Do not add the finishing Activity to mNoHistoryActivities" into sc-v2-dev