Merge changes I768830f5,I665bde3a into oc-mr1-dev

* changes:
  Removed redundant [X] icon used to close Autofill Save UI.
  Re-added outer layout on Autofill Save UI that was accidentally removed.