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

Change-Id: Id4516956039928076d57a70f732c55c699f5723c