Merge "Fix calculating Notification amountInShelf" into main