Merge "Update the BroadcastQueue logic for runtime permissions" into sc-v2-dev