Merge "[bc25] Apply the deprecated annotation to the correct QS scene." into main