Merge "Update task top activity after applying launch flags" into sc-dev