Merge "Fix the notification content view alpha regression" into main