Merge "Only call negative listener when SaveUI is dismissed by tapping button." into oc-mr1-dev
am: e8041834b1

Change-Id: I3e2bfcf5f2e00e542b0a4516f2c1eebd4f378218