Merge "WatchAction::onSubmit return correct value, not always true"