Merge "Revert the DISMISSAL_NOT_DISMISSED to previous value."