Merge "New activity launch mode - singleInstancePerTask" into sc-dev