Merge "When BT is off hide rename preference" into pi-dev