Merge "pre-SLC indicators are incorrect for BT on during call" into lmp-dev