Merge "Return to the initial screen state after each test"
am: e8b4dc40bb

Change-Id: Ic742d4ef1874605719e360e50354da0e382255d0