Merge "Fixes for Test App e2e working and UX polish." into sc-dev