Issue 3855 fixed.
Merge pull request #3935 from mohit-agarwal/issue3855

`main_site` and `stagedOnBehalfOf` localStorage fields no longer used, can be removed.