Merge "shusky: bluetooth configuration source incorrect." into main