Merge "carrier default app notification polish"