Merge "Fix data limit notification issue"