Merge "Change remaining trusted layers from BQL to Blast layer" into sc-dev