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