Merge "[Large screen] Fix searched Subsettings back navigation bug" into sc-v2-dev