Merge "Making activity invisible when occluded by one of the adjacent TF" into sc-v2-dev