Changed final state to avoid repeat submissions
Changed tests to reflect new state structure
Fix metrics with new state structure
Remove final screen timing metric from app
Remove final screen timing metric from tests
Remove final screen timing metric from reports
Merge branch 'feature/issue-30-change-final-state' into develop