Story 1625: Drop the preview screen

Fix back button in process and add a browser test to cover it

Change-Id: I5fe0aed425119268d372e7409478d627416f06b4