Merge "Fix NPE in Bluetooth Settings." into tm-dev