Merge "Fix the bluetooth extra control slice not visible" into tm-qpr-dev