fix intent flags in WHA, ensure done button clicked once