Merge "Create NotificationOptimizedLinearLayout" into main