Merge "Set bluetooth discoverable off at power on time if the timeout is no forever"