Merge "Do not ignore views that are GONE" into sc-dev