Merge "Fix notification assistant setting"