Merge "Update visibility when finishing activity" into sc-dev