Merge "Remove unknown visibility record when finishing activity" into main