Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev