Merge "Validate notification placement at transition end" into main