Final BT toggle fix!

Change-Id: I0c8f85ef87d1f359c18cab8c4d07f681fe2b5649
Signed-off-by: Gergely Szell (sethyx) <szell@hu.ibm.com>
Merge branch 'xy' into XY