Merge branch 'tmp-branch' into HEAD

* tmp-branch:
  FP2-174: [APP-Contacts] Contact can't be deleted after edit contact in editcontact page
  FP2-171: DUT can't back to the preview page when tapping the back icon of Memory status panel