Merge "Fix private space icons disappearing from search state." into main