Merge "Fix finishing adjacent TaskFragments occludes activities below" into sc-v2-dev