Merge "NotificationTest: revert overeager BigPictureStyle changes" into main