Merge "Fix default app notification locking on new devices" into qt-dev