Merge "Re-add callback to onCancel() when screen is touched outside Save UI." into oc-mr1-dev
am: 87794e95a2

Change-Id: I4d9f94d688aa27789112afb070e262b76aad8926