Merge "Change Bluetooth apex mountpoint" into tm-dev