Merge "fix race in getAppActiveNotifications"