Merge "Stop loading state after data load" into sc-v2-dev