Merge "Revert "Enable notification permission feature""