Merge "Improve BP dismissal signals" into main