Merge "Fix NPE force close if disabling BT feature" into main