Merge "Add tolerance to Bitmap sizes in Notification test" into main