[PATCH v2 0/2] Fix unmasking interrupt bit and remove watermark interrupt enablement