Merge branch 'content-shell-ready-state' into stable

Closes #3