Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread