Merge "Fixes for new Background Activity Launch (BAL) Modes" into main