Merge "Leak 2 views for the view leak detection test" into sc-dev