Merge "Adding more checks for apps coming from saved prefs and from DND."