Merge "[bc25] Handle transitions involving overlays." into main