Merge "Check if the view can be recycled if viewId is set" into sc-v2-dev