Merge "Prevent message being sent twice in onSavePassword"