Merge "Revert "Always check if the view can be recycled."" into sc-v2-dev