Merge "Refactored ViewState." into oc-dev