Merge "Fix the truncating of Bluetooth icons." into lmp-dev