Fix Application badge number issue for >3.0