Merge "Re-add callback to onCancel() when screen is touched outside Save UI."...
Merge "Re-add callback to onCancel() when screen is touched outside Save UI." into oc-mr1-dev am: 87794e95
am: 478a98a3
Change-Id: If5f3bd13aa86d21770cf50549bc880d2d7cce596