Merge "Enable notification permission enforcement"