Merge "Do not consider finishing dream activity as occluded" into sc-dev