Merge "[MS55.2] Move NetworkStateSnapshot into module folder" into sc-mainline-prod